Fix test flakiness introduced in encryption tests #48659
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes some flakiness I introduced with 4f36572.
We'll make sure we eager load all the encrypted attribute types declared before tests start, to prevent local encryption settings changes in tests from interfering with other tests.
Kudos to @p8 for tracking this one down and seeing how to fix it. This PR is just a generalization of his solution from #48641.
I'm sorry I missed this one with that commit 🙏.
Fixes #48605
Closes #48641
Checklist
Before submitting the PR make sure the following are checked:
[Fix #issue-number]